-
Notifications
You must be signed in to change notification settings - Fork 307
Allow workspace options to affect build system search #1889
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@swift-ci please test |
6925afe
to
a26f35d
Compare
@swift-ci please test |
Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift
Outdated
Show resolved
Hide resolved
a26f35d
to
d9bba40
Compare
@swift-ci please test |
@swift-ci please test Windows platform |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two small comments, otherwise LGTM. Thanks!
Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift
Outdated
Show resolved
Hide resolved
d9bba40
to
3a4d11e
Compare
@swift-ci please test |
@swift-ci please test Windows platform |
3a4d11e
to
d6d337c
Compare
@swift-ci please test |
d6d337c
to
80941d8
Compare
@swift-ci please test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, just a few small comments.
Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift
Outdated
Show resolved
Hide resolved
Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift
Outdated
Show resolved
Hide resolved
Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift
Outdated
Show resolved
Hide resolved
80941d8
to
e0532ae
Compare
@swift-ci please test |
@swift-ci please test Windows platform |
There were a few places that options only took place *after* determining a build system, even though we have multiple that impact the search (eg. `defaultBuildSystem` and `searchPaths`). Additionally track project root and configuration paths separately, so that when searching for implicit workspaces we can make sure to skip creating duplicates.
e0532ae
to
0c89669
Compare
@swift-ci Please test |
@swift-ci Please test Windows |
There were a few places that options only took place after determining
a build system, even though we have multiple that impact the search (eg.
defaultBuildSystem
andsearchPaths
).Do not search up the directory tree when searching for a build system
for a workspace. Only allow this for implicit workspaces (created when
no existing workspace can handle a file) and only up to any existing
workspace roots.